From 147e58f80485e25b15747d54719b8c54f6ea2381 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 29 Dec 2008 18:58:27 +0000 Subject: [PATCH] (bug 11330) Passing default to Request->getInt() is good enough, rather than added code to do the same thing --- includes/RawPage.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/includes/RawPage.php b/includes/RawPage.php index 5d5c081e1a..6b41e856ac 100644 --- a/includes/RawPage.php +++ b/includes/RawPage.php @@ -34,7 +34,7 @@ class RawPage { } $ctype = $this->mRequest->getVal( 'ctype' ); - $smaxage = $this->mRequest->getIntOrNull( 'smaxage', $wgSquidMaxage ); + $smaxage = $this->mRequest->getInt( 'smaxage', $wgSquidMaxage ); $maxage = $this->mRequest->getInt( 'maxage', $wgSquidMaxage ); $this->mExpandTemplates = $this->mRequest->getVal( 'templates' ) === 'expand'; @@ -73,11 +73,9 @@ class RawPage { if( $gen == 'css' ) { $this->mGen = $gen; - if( is_null( $smaxage ) ) $smaxage = $wgSquidMaxage; if($ctype == '') $ctype = 'text/css'; } elseif( $gen == 'js' ) { $this->mGen = $gen; - if( is_null( $smaxage ) ) $smaxage = $wgSquidMaxage; if($ctype == '') $ctype = $wgJsMimeType; } else { $this->mGen = false; -- 2.20.1